autogenerate gtk.def, cleanup

2004-08-09  Hans Breuer  <hans@breuer.org>

	* gtk/makefile.msc.in : autogenerate gtk.def, cleanup

	* gdk/win32/gdkwindow-win32.c gdk/win32/gdkevents-win32.c :
	removed long time unused ifdef/ed code (WITHOUT_WM_CREATE),
	removed duplicated call to gdk_window_set_cursor()

diff --git a/ChangeLog b/ChangeLog
index 66b1d63e43686ddfeef6918b8db0575108150551..f68eb297f54758f27eb08ceca53b559e649d68f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-09  Hans Breuer  <hans@breuer.org>
+
+       * gtk/makefile.msc.in : autogenerate gtk.def, cleanup
+
+       * gdk/win32/gdkwindow-win32.c gdk/win32/gdkevents-win32.c : 
+       removed long time unused ifdef/ed code (WITHOUT_WM_CREATE), 
+       removed duplicated call to gdk_window_set_cursor()
+
 Mon Aug  9 15:41:17 2004  Matthias Clasen  <maclas@gmx.de>
 
        Add hidden aliases for exported symbols which are

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 66b1d63e43686ddfeef6918b8db0575108150551..f68eb297f54758f27eb08ceca53b559e649d68f0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2004-08-09  Hans Breuer  <hans@breuer.org>
+
+       * gtk/makefile.msc.in : autogenerate gtk.def, cleanup
+
+       * gdk/win32/gdkwindow-win32.c gdk/win32/gdkevents-win32.c : 
+       removed long time unused ifdef/ed code (WITHOUT_WM_CREATE), 
+       removed duplicated call to gdk_window_set_cursor()
+
 Mon Aug  9 15:41:17 2004  Matthias Clasen  <maclas@gmx.de>
 
        Add hidden aliases for exported symbols which are

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 66b1d63e43686ddfeef6918b8db0575108150551..f68eb297f54758f27eb08ceca53b559e649d68f0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2004-08-09  Hans Breuer  <hans@breuer.org>
+
+       * gtk/makefile.msc.in : autogenerate gtk.def, cleanup
+
+       * gdk/win32/gdkwindow-win32.c gdk/win32/gdkevents-win32.c : 
+       removed long time unused ifdef/ed code (WITHOUT_WM_CREATE), 
+       removed duplicated call to gdk_window_set_cursor()
+
 Mon Aug  9 15:41:17 2004  Matthias Clasen  <maclas@gmx.de>
 
        Add hidden aliases for exported symbols which are

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 66b1d63e43686ddfeef6918b8db0575108150551..f68eb297f54758f27eb08ceca53b559e649d68f0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2004-08-09  Hans Breuer  <hans@breuer.org>
+
+       * gtk/makefile.msc.in : autogenerate gtk.def, cleanup
+
+       * gdk/win32/gdkwindow-win32.c gdk/win32/gdkevents-win32.c : 
+       removed long time unused ifdef/ed code (WITHOUT_WM_CREATE), 
+       removed duplicated call to gdk_window_set_cursor()
+
 Mon Aug  9 15:41:17 2004  Matthias Clasen  <maclas@gmx.de>
 
        Add hidden aliases for exported symbols which are

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 4c0f5062dc01620c907fc886c63267eba385aec1..28026202f8c51d13e5ae306bdf276836eaf50799 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2137,7 +2137,6 @@ gdk_event_translate (GdkDisplay *display,
          PostMessage (msg->hwnd, msg->message,
                       msg->wParam, msg->lParam);
        }
-#ifndef WITHOUT_WM_CREATE
       else if (msg->message == WM_CREATE)
        {
          window = (UNALIGNED GdkWindow*) (((LPCREATESTRUCT) msg->lParam)->lpCreateParams);
@@ -2147,7 +2146,6 @@ gdk_event_translate (GdkDisplay *display,
        {
          GDK_NOTE (EVENTS, g_print (" (no GdkWindow)"));
        }
-#endif
       return FALSE;
     }
   

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 6f839bc92754cda9699059308f9d313b1f484b7c..dd28f62cf367020b62c82f2566d95a637f904287 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -594,9 +594,6 @@ gdk_window_new (GdkWindow     *parent,
       GDK_NOTE (MISC, g_print ("...GDK_INPUT_ONLY, system colormap"));
     }
 
-  gdk_window_set_cursor (window, ((attributes_mask & GDK_WA_CURSOR) ?
-                                 (attributes->cursor) :
-                                 NULL));
   switch (private->window_type)
     {
     case GDK_WINDOW_TOPLEVEL:
@@ -680,21 +677,6 @@ gdk_window_new (GdkWindow     *parent,
 
   mbtitle = g_locale_from_utf8 (title, -1, NULL, NULL, NULL);
   
-#ifdef WITHOUT_WM_CREATE
-  draw_impl->handle =
-    CreateWindowEx (dwExStyle,
-                   MAKEINTRESOURCE(klass),
-                   mbtitle,
-                   dwStyle,
-                   ((attributes_mask & GDK_WA_X) ?
-                    impl->position_info.x - offset_x : CW_USEDEFAULT),
-                   impl->position_info.y - offset_y, 
-                   window_width, window_height,
-                   hparent,
-                   NULL,
-                   _gdk_app_hmodule,
-                   NULL);
-#else
   {
   HWND hwndNew =
     CreateWindowEx (dwExStyle,
@@ -733,7 +715,6 @@ gdk_window_new (GdkWindow     *parent,
   }
   g_object_ref (window);
   gdk_win32_handle_table_insert (&GDK_WINDOW_HWND (window), window);
-#endif
 
   GDK_NOTE (MISC, g_print ("... \"%s\" %dx%d@+%d+%d %p = %p\n",
                           mbtitle,
@@ -753,11 +734,6 @@ gdk_window_new (GdkWindow     *parent,
       return NULL;
     }
 
-#ifdef WITHOUT_WM_CREATE
-  g_object_ref (window);
-  gdk_win32_handle_table_insert (&GDK_WINDOW_HWND (window), window);
-#endif
-
   gdk_window_set_cursor (window, ((attributes_mask & GDK_WA_CURSOR) ?
                                  (attributes->cursor) :
                                  NULL));

diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 259a4486d24e1c9bbc4317cf2f09a74e45489b93..3aef0bdd740d8ddf3903dc3e5844b7cc37fda89b 100644 (file)
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -55,7 +55,7 @@ all :                                         \
 
 gtk_OBJECTS =                                  \
        fnmatch.obj                             \
-       gtkabout.obj    \
+       gtkaboutdialog.obj      \
        gtkaccelgroup.obj                       \
        gtkaccellabel.obj                       \
        gtkaccelmap.obj \
@@ -80,7 +80,6 @@ gtk_OBJECTS =                                         \
        gtkcellrenderertoggle.obj               \
        gtkcellrendererpixbuf.obj               \
        gtkcellrendererprogress.obj             \
-       gtkcellrendererseptext.obj              \
        gtkcellview.obj         \
        gtkcheckbutton.obj                      \
        gtkcheckmenuitem.obj                    \
@@ -248,7 +247,7 @@ gtk_OBJECTS =                                       \
 # Source headers which are non-autogenerated headers
 gtk_public_h_sources =         \
        gtk.h                   \
-       gtkabout.h      \
+       gtkaboutdialog.h        \
        gtkaccelgroup.h         \
        gtkaccellabel.h         \
        gtkaccelmap.h           \
@@ -429,8 +428,10 @@ gtk_extra_sources = \
 ..\config.h : ..\config.h.win32
        copy ..\config.h.win32 ..\config.h
 
-# Removed: gtk.defs 
-GENERATED = gtktypebuiltins.h gtktypebuiltins.c gtkmarshal.h gtkmarshal.c gtkmarshalers.h gtkmarshalers.c
+GENERATED = \
+       gtktypebuiltins.h gtktypebuiltins.c \
+       gtkmarshal.h gtkmarshal.c gtkmarshalers.h gtkmarshalers.c \
+       gtk.def gtkalias.h
 
 #
 # Generated source files:
@@ -438,15 +439,12 @@ GENERATED = gtktypebuiltins.h gtktypebuiltins.c gtkmarshal.h gtkmarshal.c gtkmar
 generated : $(GENERATED)
        $(TOUCH) generated
 
-gtk.defs : $(gtk_public_h_sources) makefile.msc
-       $(PERL) $(GLIB)\gobject\glib-mkenums \
-               --comments ";; @comment@" \
-               --fprod "; enumerations from \"@filename@\"\n " \
-               --vhead "(define-@type@ @EnumName@" \
-               --vprod "   (@valuenick@ @VALUENAME@)" \
-               --vtail ")" \
-               $(gtk_public_h_sources) > xgen-gdef
-       copy xgen-gdef gtk.defs
+gtk.def: gtk.symbols
+       echo EXPORTS > gtk.def
+       cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 gtk.symbols >> gtk.def
+
+gtkalias.h: gtk.symbols
+       cl /EP -DG_OS_WIN32 -DGTK_WINDOWING_WIN32 -DINCLUDE_INTERNAL_SYMBOLS gtk.symbols | $(PERL) makegtkalias.pl > gtkalias.h
 
 # generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
 # use 'echo' to work around 'command line too long'
@@ -521,9 +519,3 @@ $(EXAMPLE).obj : ..\examples\$(EXAMPLE)\$(EXAMPLE).c
 $(EXAMPLE).exe : $(EXAMPLE).obj
        $(CC) $(CFLAGS) $(EXAMPLE).obj $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
 
-makefile.msc: makefile.msc.in
-       sed -e s,@GTK[_]MAJOR_VERSION@,@GTK_MAJOR_VERSION@, \
-           -e s,@GTK[_]MINOR_VERSION@,@GTK_MINOR_VERSION@, \
-           -e 's,@GTK[_]VERSION@,@GTK_VERSION@,' \
-           -e 's,@GDK_PIXBUF[_]MAJOR@,@GDK_PIXBUF_MAJOR@,' \
-           -e 's,@GDK_PIXBUF[_]MINOR@,@GDK_PIXBUF_MINOR@,'  <makefile.msc.in >$@